Add current indexed version to repos table. #1262

amotzte · 2016-11-01T22:27:16Z

Why needed

Currently the repos table on home page already shows some details about the available projects. I found it very helpful to also show what is the current indexed version for each project. This way you can immediately know how much up to date the project is.

As a start I added the information for git SCM only but I prepared the infrastructure to add for other SCM (much like the “branch” column).

Here is the result:

tarzanek · 2016-11-02T12:44:49Z

can you fix tests @amotzte ? thnx (check travis - https://travis-ci.org/OpenGrok/OpenGrok/builds/172456917 )

we will need to sort out OCA - either check http://www.oracle.com/technetwork/community/oca-486395.html , print, sign , scan, mail back to oracle
or I am ok if you say you agree with OCA for this patch in this thread

tarzanek · 2016-11-02T12:46:05Z

also - and this is a prereq - we will need to cache this somehow to history folder, I don't think it is good to query SCM for every web request

amotzte · 2016-11-02T14:12:06Z

I agree with OCA for this patch

Hi @tarzanek as far as I understand, all of the table information (Including this new field) is cached. The determineCurrentVersion is being called in only 2 cases:

When server starts
After index

The only function that is being called for every request is getCurrentVersion. This function returns the value from a local variable. Am I missing something?

tulinkry · 2016-11-03T12:08:33Z

web/repos.jspf

@@ -263,8 +264,13 @@ Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
                                if (branch == null) {
                                    branch = "N/A";
                                }
+                                String currentVersion = ri.getCurrentVersion();


There are two places in repos.jspf where a line about repository is being printed to the output. So this should be handled in both cases.

tulinkry · 2016-11-03T12:10:28Z

src/org/opensolaris/opengrok/history/AccuRevRepository.java

+    @Override
+    String determineCurrentVersion() {
+        return null;
+    }


Wrong copyright date.

tulinkry · 2016-11-03T12:10:38Z

src/org/opensolaris/opengrok/history/BazaarRepository.java

@@ -369,4 +369,9 @@ String determineParent() throws IOException {
    String determineBranch() {
        return null;
    }
+


Wrong copyright date.

tulinkry · 2016-11-03T12:10:46Z

src/org/opensolaris/opengrok/history/ClearCaseRepository.java

@@ -418,4 +418,9 @@ String determineParent() throws IOException {
    String determineBranch() {
        return null;
    }
+


Wrong copyright date.

tulinkry · 2016-11-03T12:11:00Z

src/org/opensolaris/opengrok/history/MercurialRepository.java

@@ -681,4 +681,9 @@ String determineParent() throws IOException {

        return executor.getOutputString().trim();
    }
+


Wrong copyright date.

tulinkry · 2016-11-03T12:11:47Z

src/org/opensolaris/opengrok/history/Repository.java

@@ -364,6 +364,8 @@ final void createCache(HistoryCache cache, String sinceRevision)
     */
    abstract String determineBranch() throws IOException;

+    abstract String determineCurrentVersion() throws IOException;


Wrong copyright date.

tulinkry · 2016-11-03T12:12:14Z

src/org/opensolaris/opengrok/history/RepositoryInfo.java

@@ -42,6 +42,7 @@
    protected String datePattern;
    protected String parent;
    protected String branch;
+    protected String currentVersion;


Wrong copyright date.

tulinkry · 2016-11-03T12:12:27Z

src/org/opensolaris/opengrok/history/SCCSRepository.java

@@ -292,4 +292,9 @@ String determineParent() throws IOException {
    String determineBranch() {
        return null;
    }
+


Wrong copyright date.

tulinkry · 2016-11-03T12:12:34Z

src/org/opensolaris/opengrok/history/SSCMRepository.java

@@ -400,4 +400,9 @@ String determineParent() throws IOException {
    String determineBranch() {
        return null;
    }
+


Wrong copyright date.

tulinkry · 2016-11-03T12:14:57Z

src/org/opensolaris/opengrok/history/Repository.java

@@ -364,6 +364,8 @@ final void createCache(HistoryCache cache, String sinceRevision)
     */
    abstract String determineBranch() throws IOException;

+    abstract String determineCurrentVersion() throws IOException;


I wonder why it's made abstract when you return null in all repositories except GitRepository. This is also about the other determineBranch and determineParent methods. @tarzanek

Good point... I followed the determineBranch function (without thinking about it) but you are absolutely right...

tulinkry · 2016-11-03T14:39:00Z

web/repos.jspf

                            %><td><%= Util.htmlize(type) %></td><%
                            %><td><%= Util.htmlize(parent) %> (<%= Util.htmlize(branch) %>)</td><%
+                            %><td><%= Util.htmlize(currentVersion) %> </td><%


When the commit message is quite long (which sometimes happen) then the table looks ugly - I'd rather see it on a single line.
I'd suggest something like displaying the date, changeset, author and first like 20-30 characters from the message (maybe with an option to show the whole message like it is in history view) + convert newlines to spaces.

tulinkry · 2016-11-03T14:47:36Z

web/repos.jspf

                            %><td><%= Util.htmlize(type) %></td><%
                            %><td><%= Util.htmlize(parent) %> (<%= Util.htmlize(branch) %>)</td><%
+                            %><td><%= Util.htmlize(currentVersion) %> </td><%


My output does not match your screenshot. Especially I don't like the enclosing '.

If you want to reformat the date to something cooler, take a look at default date format for git in history generation and getting the date formatter for git repository.

tarzanek · 2016-11-04T08:39:11Z

@amotzte hmm, I was more like thinking about the situation where the history is not stored in javadb and just uses plain files - will it cache the data even in this case? ;)

amotzte · 2016-11-04T11:22:16Z

@tarzanek All field (branch, parent scm...) in the "homepage" table are stored in projects configuration configuration.xml. Here is an example:

 <void method="add">
    <object class="org.opensolaris.opengrok.history.RepositoryInfo">
     <void property="branch">
      <string>master</string>
     </void>
     <void property="currentVersion"> <!--   <-- this is the new addition --> 
      <string>2016-09-04 17:00: 638bcfb mregev Merge pull request #2 from SPVSS-IH-UI/ui-server-ha</string>
     </void>
     <void property="datePattern">
      <string>EE, d MMM yyyy HH:mm:ss Z</string>
     </void>
     <void property="directoryName">
      <string>/var/opengrok/src/vgw_tests_and_deployment/ih-ui-server</string>
     </void>
     <void property="parent">
      <string>git@github3.cisco.com:SPVSS-IH-UI/ih-ui-server.git</string>
     </void>
     <void property="type">
      <string>git</string>
     </void>
    </object>
   </void>

So to my understanding all of these fields are cached/stored (in RuntimeEnvironment?) so we will not be executing git command for each web request in the same way that are are not doing it now for the rest of these fields .

tulinkry · 2016-11-04T11:25:45Z

web/repos.jspf

                                %><td><%= Util.htmlize(type) %></td><%
                                %><td><%= Util.htmlize(parent) %> (<%= Util.htmlize(branch) %>)</td><%
+                                %><td><%


Now it looks like this:

Which has not really necessary margin, can you avoid this?

We have to set the table column to be at fixed size so in case user choose to open the "show more..." it will not change the other columns size (which feel annoying in the eye..). Currently they are divided with default size (each column get the exact some size). I guess I can reduce the size of "SCM type" to something smaller but still fixed and give more space to "Parent (branch)" and "Current version". I'll give it a try.

I'm more talking about this, which is not like it was before (there was just single line with no margin). It's solved for me by replacing <p> with <span> however then the "show more" link does not work.

You can restrict the scm column to some small percentage of the width, and also you always know what is the longest scm supported by OpenGrok.

Fixed
@tulinkry, I set only "Current version" to be fixed so the rest can adjust according to their size. I also fixed the extra margins. See new screenshots.

I'd like to stay with the one line like this:

tarzanek · 2016-11-04T11:53:44Z

@amotzte thanks & sorry for stupid Q, this explains, I was under the impression this needs to be stored in history folder per every project, if we serialize it down to config. xml then great :)
thank you
L

tulinkry · 2016-11-10T16:00:39Z

web/repos.jspf

@@ -125,12 +125,17 @@ Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
                <%
                if (pHelper.getRepositories(group).size() > 0 ) {
                %>
-                    <table>
+                    <table >
+                    <col/>


Avoid using <col> as the attributes are mostly obsolete in html5

Extract this into the css files (default/style.css, polished/style.css, offwhite/style.css). Do not forget to change all of them. You can set a class attribute on the column or select it with some other more complicated selector.

tulinkry · 2016-11-10T16:00:46Z

web/repos.jspf

@@ -125,12 +125,17 @@ Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
                <%
                if (pHelper.getRepositories(group).size() > 0 ) {
                %>
-                    <table>
+                    <table >


extra space?

tulinkry · 2016-11-10T16:01:26Z

web/repos.jspf

+                                %>
+                                <span class="rev-message-summary"><%= coutSummary %></span>
+                                <span class="rev-message-full rev-message-hidden"><%= cout %></span>
+                                <div  data-toggle-state="less"><a class="rev-toggle-a rev-message-toggle "  href="#">show more ... </a></div>


As it is in my screenshot...I'd make this <span> instead of <div>. Having an extra line seems unnecessarily to me.

tulinkry · 2016-11-10T16:01:50Z

web/repos.jspf

-                        <table>
-                            <thead>
+                        <table/>
+                        <col/>


The same problem like above about the css.

Currently only support for git

amotzte

Change to one line and move col definition to css

amotzte · 2016-11-10T23:28:43Z

web/repos.jspf

                                %><td><%= Util.htmlize(type) %></td><%
                                %><td><%= Util.htmlize(parent) %> (<%= Util.htmlize(branch) %>)</td><%
+                                %><td><%


tulinkry · 2016-11-11T11:36:57Z

I'm fine

tulinkry · 2017-01-05T12:43:19Z

@vegetablemao You might want to try the following snippet:

String d = "Fri, 14 May 2010 23:24:24 +0200";
String one = "EE, d MMM yyyy HH:mm:ss Z";
String two = "d MMM yyyy HH:mm:ss Z";

SimpleDateFormat format = new SimpleDateFormat(one, Locale.getDefault());

try {
    Date date = format.parse(d);
    System.out.println("Successfully parsed " + date);
} catch (ParseException ex) {
    System.out.println("Parsing failed");
}

as this is the way we parse the git log dates. If it fails, try to change the line where the format is created to

SimpleDateFormat format = new SimpleDateFormat(one);

to see if it helps.

tulinkry · 2017-01-20T14:16:13Z

@vegetablemao support for old git is already in the trunk (#1314)
and you may want to try the current head (with #1336) to get more information about the

GitHistoryParser.process: Failed to parse author date: AuthorDate: Fri, 14 May 2010 23:24:24 +0200

as I added more verbose information to that exception.

amotzte closed this Nov 1, 2016

amotzte reopened this Nov 1, 2016

tarzanek self-assigned this Nov 2, 2016

amotzte force-pushed the master branch from 8d789e3 to 91ce2de Compare November 2, 2016 18:25

tulinkry suggested changes Nov 3, 2016

View reviewed changes

amotzte force-pushed the master branch from 91ce2de to 7b6d0f8 Compare November 3, 2016 14:08

tulinkry approved these changes Nov 3, 2016

View reviewed changes

tulinkry suggested changes Nov 3, 2016

View reviewed changes

amotzte force-pushed the master branch from 7b6d0f8 to 1b067ab Compare November 3, 2016 21:35

tulinkry approved these changes Nov 4, 2016

View reviewed changes

tulinkry suggested changes Nov 4, 2016

View reviewed changes

tarzanek added this to the 0.13 milestone Nov 4, 2016

amotzte force-pushed the master branch 5 times, most recently from d971efa to 5747523 Compare November 5, 2016 09:26

tulinkry suggested changes Nov 10, 2016

View reviewed changes

tarzanek assigned tulinkry and unassigned tarzanek Nov 10, 2016

amotzte force-pushed the master branch 2 times, most recently from 65514f5 to 39242da Compare November 10, 2016 23:25

Add current indexed version to repos table.

fd69097

Currently only support for git

amotzte force-pushed the master branch from 39242da to fd69097 Compare November 10, 2016 23:27

amotzte commented Nov 10, 2016

View reviewed changes

tulinkry approved these changes Nov 11, 2016

View reviewed changes

vladak merged commit a59ac9a into oracle:master Nov 11, 2016

tulinkry mentioned this pull request Nov 16, 2016

adding current version info into mercurial repository #1284

Merged

tulinkry mentioned this pull request Jan 5, 2017

something wrong with git log #1310

Closed

tulinkry mentioned this pull request Jan 5, 2017

Supporting older git < 2.6 which does not have --date:format option #1314

Merged

tulinkry mentioned this pull request Feb 13, 2017

Is there a major change in generating the git history from 13-rc4 to 13-rc7 - peformance drawback? #1402

Closed

brunoborges unassigned tulinkry Dec 18, 2017

		@@ -681,4 +681,9 @@ String determineParent() throws IOException {

		return executor.getOutputString().trim();
		}

Add current indexed version to repos table. #1262

Add current indexed version to repos table. #1262

Uh oh!

Conversation

amotzte commented Nov 1, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Why needed

Here is the result:

Uh oh!

tarzanek commented Nov 2, 2016

Uh oh!

tarzanek commented Nov 2, 2016

Uh oh!

amotzte commented Nov 2, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

tulinkry Nov 3, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

tulinkry Nov 3, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

tulinkry Nov 3, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

tarzanek commented Nov 4, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

amotzte commented Nov 4, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

amotzte Nov 4, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

amotzte Nov 4, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

tarzanek commented Nov 4, 2016

Uh oh!

amotzte commented Nov 1, 2016 •

edited

Loading

amotzte commented Nov 2, 2016 •

edited

Loading

tulinkry Nov 3, 2016 •

edited

Loading

tulinkry Nov 3, 2016 •

edited

Loading

tulinkry Nov 3, 2016 •

edited

Loading

tarzanek commented Nov 4, 2016 •

edited

Loading

amotzte commented Nov 4, 2016 •

edited

Loading

amotzte Nov 4, 2016 •

edited

Loading

amotzte Nov 4, 2016 •

edited

Loading

tulinkry Nov 10, 2016 •

edited

Loading

tulinkry Nov 10, 2016 •

edited

Loading